merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 11 May 2012 12:43:46 +0000 (21:43 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 11 May 2012 12:43:46 +0000 (21:43 +0900)
commit066c7c8ee3866c159b07239d9dce5c141938dfee
treedb05e9830468bd4ccf67a20723a9d82bf8fbf3b0
parenta79b0c5c40a3aa8daf1660039b63b28d3204b247
parent4c56a4697e585b8fd83cfc704de6465092e65f0c
merge trunk